Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 28 Apr 2010 12:11:11 +0000 (12:11 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 28 Apr 2010 12:11:11 +0000 (12:11 +0000)
commit9ebbf1fbac129d1088fd14906d02f08fcf5aa17b
treefc62e75c5f60e00d03d75c6a6f92dda841afeb0a
parentc469e502dadadf4b303b0d7d14c6c839261d40ed
parent23a5b9183f78626858a9db7d2aac99608b12f9c0
Merge from mainline.